add hot feature 1
add support method 1
add hot feature 2
add support method 2
Merge branch 'hot_feature'

Conflicts:
	dummy.project/src/test/pack/Test1.java
fix bug #45673
add hot feature 3
Merge branch 'bugfixing' into hot_feature
Merge branch 'hot_feature'

Conflicts:
	dummy.project/src/test/pack/Test1.java