dev to standard, to be merged
Merge branch 'dev_to_standard_2'