Merge "Support Fenix and sample implementation accordingly"